In
`@core/datastore/src/commonMain/kotlin/org/mifos/mobile/core/datastore/UserPreferencesDataSource.kt`:
- Around line 239-253: The direct getters/setters currently use
SELECTED_SERVICES_KEY and diverge from the APP_SETTINGS path used by
setSelectedServices, causing stale state; change saveSelectedServicesDirectly
and getSelectedServicesDirectly to read/write the same SettingsPreference via
settings.getSettingsPreference() and settings.putSettingsPreference(...) (i.e.,
build a newPreference = settings.getSettingsPreference().copy(selectedServices =
services) when saving) and ensure they also update _settingsInfo.value to the
new preference so all callers share a single source of truth; reference
setSelectedServices, saveSelectedServicesDirectly, getSelectedServicesDirectly,
_settingsInfo, settings.getSettingsPreference and settings.putSettingsPreference
when making the change.

In
`@feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeScreen.kt`:
- Around line 370-373: Replace the hard-coded contentDescription "Selected" in
the Icon usage (the Icon with imageVector = MifosIcons.CheckCircle1 inside
HomeScreen.kt) with a localized stringResource; add a new string key
feature_home_selected to
feature/home/src/commonMain/composeResources/values/strings.xml (and localized
variants) and reference it via stringResource(Res.string.feature_home_selected)
for accessibility/i18n.
- Around line 248-251: The Icon's contentDescription is hard-coded; create a
localized string resource named "feature_home_edit_services" and replace the
literal "Edit services" with a lookup to that resource so the Icon uses the
localized text based on isEditMode (i.e., keep the Icon call using imageVector =
if (isEditMode) MifosIcons.Edit else MifosIcons.GridApps but set
contentDescription to the localized string obtained from resources), ensuring
the same resource is used for accessibility in HomeScreen.

In
`@feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeScreen.kt`:
- Around line 241-258: The Icon currently uses Modifier.size(16.dp).clickable {
toggleEditMode() } which yields a 16.dp touch target; replace this raw Icon
click handling with a Material IconButton to provide the standard 48dp
accessible touch target: wrap the Icon in an IconButton (or use IconButton
composable) and move the toggleEditMode() click handler to the IconButton's
onClick, keeping the same imageVector selection (if (isEditMode) MifosIcons.Edit
else MifosIcons.GridApps), contentDescription, tint, and size for the visual
icon while allowing the IconButton to ensure proper padding and accessibility in
the Row where Text and Icon are defined.

In
`@feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeScreen.kt`:
- Around line 242-259: The accessibility label currently always says "Edit
services" even when isEditMode is true; change the Icon's contentDescription to
be conditional on isEditMode (e.g., use a "Done/Save services" or "Exit edit
mode" string resource when isEditMode is true, and "Edit services" when false)
so the IconButton(toggleEditMode) accurately describes the action; update the
string resource keys if needed and reference isEditMode, toggleEditMode(),
IconButton and Icon in HomeScreen.kt when making the change.

In
`@feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeScreen.kt`:
- Around line 147-151: toggleEditMode currently calls the blocking, non-suspend
preferencesRepository.saveSelectedServices(...) on the main thread; wrap that
call in a coroutine launched on a background dispatcher (e.g., Dispatchers.IO or
an injected/background CoroutineScope) so the synchronous SharedPreferences
write runs off the UI thread, while keeping any UI state updates (toggling
isEditMode) on the main/Main thread; locate the toggleEditMode function and
replace the direct call to
preferencesRepository.saveSelectedServices(selectedServices) with a coroutine
launch that calls that method on an IO/background scope and optionally handles
errors.

In
`@feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeScreen.kt`:
- Around line 299-300: When not in edit mode the filtered displayItems can be
empty (selectedServices empty) leaving users without guidance; update the
HomeScreen UI logic to detect when displayItems.isEmpty() and render an
empty-state placeholder message or composable (e.g., "Tap the grid icon to add
services") instead of the grid rows. Locate the displayItems/rows calculation
and the composable that renders chunked rows (references: displayItems, rows,
columnCount, isEditMode, selectedServices) and add a conditional branch to show
the placeholder when displayItems.isEmpty() and !isEditMode.
- Around line 150-158: The toggleEditMode currently launches a coroutine to call
preferencesRepository.saveSelectedServices but flips isEditMode immediately, so
save failures are ignored; change toggleEditMode so that when isEditMode is true
you perform the save inside scope.launch and only set isEditMode = false after a
successful save, catching exceptions from
preferencesRepository.saveSelectedServices (use try/catch or runCatching) and
handle failures by logging and surfacing an error to the user (e.g., snackbar or
error state) instead of toggling off; keep the immediate toggle behavior when
entering edit mode (when isEditMode is false) outside the save path. Use the
existing scope, toggleEditMode, isEditMode and
preferencesRepository.saveSelectedServices symbols to locate and update the
logic.

In
`@feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeScreen.kt`:
- Around line 140-158: Move the service-selection state and persistence out of
the composable into HomeViewModel: stop calling koinInject() in
HomeScreen/HomeContent, inject UserPreferencesRepository into HomeViewModel
instead, expose selectedServices and isEditMode as StateFlow (or
MutableStateFlow) and provide a toggleEditMode() method that handles loading,
mutating and saving via coroutine scope inside the ViewModel; update
HomeScreen/HomeContent to consume those StateFlows and call
viewModel.toggleEditMode(), ensuring previews/tests can construct the composable
without Koin by passing mocked/empty state flows or a preview HomeViewModel.

In
`@feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeViewModel.kt`:
- Around line 248-264: handleToggleEditMode currently catches Exception which
swallows CancellationException and also silently discards persisted selections
on save failure; change the try/catch to rethrow CancellationException (or only
catch specific save-related exceptions) around the call to
userPreferencesRepositoryImpl.saveSelectedServices(state.selectedServices), and
on any non-cancellation save failure restore the UI selection by resetting
state.selectedServices to the last persisted value (obtainable from
userPreferencesRepositoryImpl.getSelectedServices() or your repository's
equivalent) before calling updateState { it.copy(isEditMode = false) } so
cancellation propagates correctly and the in-memory selections remain consistent
with storage.

In
`@feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeScreen.kt`:
- Around line 326-367: The clickable Box with role=Role.Button lacks an
accessible label because Image has contentDescription=null and the service title
Text sits outside the touch target; update the accessibility by either moving
the clickable modifier to the parent Column (so the onClick on Column encloses
both Image and the title Text) or add an explicit spoken label via the
clickable's onClickLabel and/or provide a non-null contentDescription on the
Image (use stringResource for the service title or a dedicated label string).
Locate the clickable modifier in the Box and the Image(contentDescription), and
change one of them so the button exposes a descriptive label to screen readers
(e.g., use Column.clickable or clickable(onClickLabel = stringResource(...))
and/or remove contentDescription=null and supply the title string).

In
`@feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeViewModel.kt`:
- Around line 305-317: The toggle logic in handleToggleServiceSelection reads
state.selectedServices outside updateState, causing a race where rapid taps can
clobber toggles; move the computation of newSelection and visibleItems inside
the updateState lambda so you operate on the latest state snapshot (use the
lambda parameter e.g. it.selectedServices), then set selectedServices to the
computed newSelection and visibleItems to computeVisibleItems(selectedServices =
newSelection) within the same updateState call.
- Around line 63-65: The call to loadSavedServices() in HomeViewModel's init is
doing synchronous disk I/O via userPreferencesRepositoryImpl.selectedServices ->
getSelectedServicesDirectly() -> settings.getStringOrNull(); wrap the
loadSavedServices() invocation inside viewModelScope.launch(Dispatchers.IO) (or
launch { withContext(Dispatchers.IO) { ... } }) so the disk read runs off the
main thread, leaving saveSelectedServices as-is (it already uses
viewModelScope.launch); update references to loadSavedServices() in the init
block to call it from that coroutine context.